Merge from origin/emacs-25

0ae9a81 Document 'timerp'
2c72c46 Improve documentation of overlay priorities
f6fa160 Fix 'dired-compress-files'
2b8c5f0 Update commentary of STRING_CHAR and FETCH_MULTIBYTE_CHAR

# Conflicts:
#	lisp/dired.el
#	src/buffer.h
#	src/character.h

diff --cc doc/lispref/display.texi
Simple merge

diff --cc doc/lispref/os.texi
Simple merge

diff --cc lisp/dired-aux.el
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/character.h
Simple merge